bitkeeper revision 1.391 (3f316acaX8G5OlQyJ0l_ZX0sG-sl-A)

schedule.c, xi_sched_domain.c:
  Fix setting of scheduler parameters from dom0.

diff --git a/tools/internal/xi_sched_domain.c b/tools/internal/xi_sched_domain.c
index c8d921f890065e0ed834a9302f831fb43767f116..1408be422bb897a3553c243b3bd14c2aa90b942d 100644 (file)
--- a/tools/internal/xi_sched_domain.c
+++ b/tools/internal/xi_sched_domain.c
@@ -21,10 +21,10 @@ int main(int argc, char **argv)
 
     op.cmd = DOM0_ADJUSTDOM;
     op.u.adjustdom.domain  = atoi(argv[1]);
-    op.u.adjustdom.mcu_adv = atol(argv[1]);
-    op.u.adjustdom.warp    = atol(argv[1]);
-    op.u.adjustdom.warpl   = atol(argv[1]);
-    op.u.adjustdom.warpu   = atol(argv[1]);
+    op.u.adjustdom.mcu_adv = atol(argv[2]);
+    op.u.adjustdom.warp    = atol(argv[3]);
+    op.u.adjustdom.warpl   = atol(argv[4]);
+    op.u.adjustdom.warpu   = atol(argv[5]);
     if ( do_dom0_op(&op) < 0 )
         return 1;
 

diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index 3c1cef24f0fb3b4e5e0f65165777c45e6bf156b3..06f66518d420c769c7141283bc05fcf52f66ef70 100644 (file)
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -208,7 +208,6 @@ long do_yield(void)
  ****************************************************************************/
 long sched_bvtctl(unsigned long c_allow)
 {
-    printk("sched: bvtctl %lu\n", c_allow);
     ctx_allow = c_allow;
     return 0;
 }
@@ -221,8 +220,9 @@ long sched_adjdom(int dom, unsigned long mcu_adv, unsigned long warp,
 {
     struct task_struct *p;
 
-    printk("sched: adjdom %02d %lu %lu %lu %lu\n",
-           dom, mcu_adv, warp, warpl, warpu);
+    /* Sanity -- this can avoid divide-by-zero. */
+    if ( mcu_adv == 0 )
+        return -EINVAL;
 
     p = find_domain_by_id(dom);
     if ( p == NULL )